Index: jq_eyecandy.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/jq_eyecandy/jq_eyecandy.module,v retrieving revision 1.1 diff -u -p -r1.1 jq_eyecandy.module --- jq_eyecandy.module 14 Apr 2008 18:50:13 -0000 1.1 +++ jq_eyecandy.module 28 Apr 2009 06:25:29 -0000 @@ -30,9 +30,6 @@ function jq_eyecandy_init() { foreach ($plugins as $k => $v) { if (is_file($plugins[$k]) && variable_get('jq_eyecandy_'. $k .'_enabled', '')) { jquery_plugin_add($k); - if ((($k == 'dropshadow') || ($k == 'gradient')) && is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js')){ - jquery_plugin_add('dimensions'); - } drupal_add_js(variable_get('jq_eyecandy_' . $k . '_code', NULL), 'inline'); } } @@ -120,7 +117,6 @@ function jq_eyecandy_admin_settings() { $form['jq_eyecandy_dropshadow'] = array( '#type' => 'fieldset', '#title' => t('DropShadow Plugin'), - '#description' => is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js') ? t('This plugin requires the dimensions plugin which is available at: /') . $plugins['dropshadow'] : ''. t('This plugin requires the dimensions plugin which is unavailable or not located in the jquery_plugin module directory.') .'', '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -8 @@ -129,8 +125,8 @@ function jq_eyecandy_admin_settings() { $form['jq_eyecandy_dropshadow']['jq_eyecandy_dropshadow_enabled'] = array( '#type' => 'checkbox', '#title' => t('Enable the jQuery DropShadow Plugin'), - '#default_value' => is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js') ? variable_get(jq_eyecandy_dropshadow_enabled, '') : 0, - '#disabled' => !is_file($plugins['dropshadow']) || !is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js'), + '#default_value' => variable_get(jq_eyecandy_dropshadow_enabled, ''), + '#disabled' => !is_file($plugins['dropshadow']), '#description' => is_file($plugins['dropshadow']) ? t('The jQuery DropShadow plugin is available at: /') . $plugins['dropshadow'] : ''. t('The jQuery DropShadow plugin is unavailable or not located in the jquery_plugin module directory.') .'' ); @@ -139,7 +135,7 @@ function jq_eyecandy_admin_settings() { '#title' => t('jQuery DropShadow code to apply on all pages'), '#default_value' => variable_get('jq_eyecandy_dropshadow_code', ''), '#rows' => 10, - '#disabled' => !is_file($plugins['dropshadow']) || !is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js'), + '#disabled' => !is_file($plugins['dropshadow']), '#description' => t('Enter jQuery DropShadow code to be applied to all pages in all themes. Documentation is available at http://plugins.jquery.com/project/DropShadow. Enter everything that should appear within the <script> tags.') ); @@ -147,7 +143,6 @@ function jq_eyecandy_admin_settings() { $form['jq_eyecandy_gradient'] = array( '#type' => 'fieldset', '#title' => t('Gradient Plugin'), - '#description' => is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js') ? t('This plugin requires the dimensions plugin which is available at: /') . $plugins['dropshadow'] : ''. t('This plugin requires the dimensions plugin which is unavailable or not located in the jquery_plugin module directory.') .'', '#collapsible' => TRUE, '#collapsed' => TRUE, '#weight' => -7 @@ -156,8 +151,8 @@ function jq_eyecandy_admin_settings() { $form['jq_eyecandy_gradient']['jq_eyecandy_gradient_enabled'] = array( '#type' => 'checkbox', '#title' => t('Enable the jQuery Gradient Plugin'), - '#default_value' => is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js') ? variable_get(jq_eyecandy_gradient_enabled, '') : 0, - '#disabled' => !is_file($plugins['gradient']) || !is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js'), + '#default_value' => variable_get(jq_eyecandy_gradient_enabled, ''), + '#disabled' => !is_file($plugins['gradient']), '#description' => is_file($plugins['gradient']) ? t('The jQuery Gradient plugin is available at: /') . $plugins['gradient'] : ''. t('The jQuery Gradient plugin is unavailable or not located in the jquery_plugin module directory.') .'' ); @@ -166,7 +161,7 @@ function jq_eyecandy_admin_settings() { '#title' => t('jQuery Gradient code to apply on all pages'), '#default_value' => variable_get('jq_eyecandy_gradient_code', ''), '#rows' => 10, - '#disabled' => !is_file($plugins['gradient']) || !is_file(drupal_get_path('module', 'jquery_plugin') .'/jquery.dimensions.min.js'), + '#disabled' => !is_file($plugins['gradient']), '#description' => t('Enter jQuery Gradient code to be applied to all pages in all themes. Documentation is available at http://plugins.jquery.com/project/gradient. Enter everything that should appear within the <script> tags.') );